Fixing 1293

--HG--
extra : source : 196b17e9db7850c7d3c0c7d428d1889fce2c6c0c
Merge pull request #588 from einhverfr/master

Fixing 1293