Final final fix for #15