Better fix for #475