Fix for issue 792.