a more consistent fix for #1