Fix for #45