Fixing bug 1211

--HG--
extra : source : 83a853adb2124d1cb9376d84c331f762bb7c84ba
Merge pull request #338 from einhverfr/master

Fixing bug 1211