Tightened up fix for #98 once again