Fix for #893