Attempt to fix 1274

--HG--
extra : source : d47de5893db42702fb535fcc48086079c182683d
Further fixes for 1274
Merge pull request #524 from einhverfr/1.4

fixing 1274