Patch from Milosz Derezynski <internalerror at gmail.com>