Fix for #883