final fix for #61