fixing 1268

--HG--
extra : source : f56f0f5592380be57690ce3a3dd587c6379d54f6
fixing 1268

--HG--
extra : source : 34deaeb680e191dae315ec05c967a7146d93d031
Merge pull request #519 from einhverfr/master

Fixing 1268