Bug fix for #58