Fixing 1283

--HG--
extra : source : d6869150fcf12027c6beab6eabd8d195b009f8d4
Merge pull request #550 from einhverfr/master

Fixing 1283