Manual fix for #54