Fix for #58