Revise fix for #149