final fix for #154