final fix for #12