Final fix for #55