fix for #74
FIx for #71