fixing bug 1282

--HG--
extra : source : c0fc7ee32712c97fc6ffcd8f5684adfbb64d528c
Merge pull request #555 from einhverfr/master

fixing bug 1282