final fix for #975