Fixing bug 1208

--HG--
extra : source : 7848dc54ad5d5f8309a3a89b119fd2c886e6aefb
Merge pull request #332 from einhverfr/master

Fixing bug 1208