another fix for #2