fixing 1298

--HG--
extra : source : 5ed6dc98d43de64e9fac54b883d6e580e2f8ebfc
Merge pull request #590 from einhverfr/master

fixing 1298