Attempt to fix 1274

--HG--
extra : source : d47de5893db42702fb535fcc48086079c182683d
Further fixes for 1274