1.3.10 fix for #54