Patch from Samuel Cormier-Iijima <sciyoshi@gmail.com>: