Final fix for #629