Better fix for #438