another fix for #12