another fix for #264