Revise fix for #104