Fixing 1267

--HG--
extra : source : 7330c8aeb55a354e6badc83c6fde959f08200d2a
Merge pull request #517 from einhverfr/master

Fixing 1267