Fix for Issue 1598: Changes after code review