Attempt to fix 1274
Further fixes for 1274

--HG--
extra : source : 092b66d6499ef253f9231e1d7a3fd0c702fc97cc