Fix for #884