another fix for #58