final fix for #78