Code change as suggested in issue 898