fixing 1304.2

--HG--
extra : source : 3a2db4e676a57f21e3ba993dcbc957641e7a089c
Merge pull request #598 from einhverfr/master

fixing 1304.2