Fix for GH-796