Fix for #852