Fix for #350