real fix for #654