Real fix for #427