Fix for 834657