Bug fix introduced by Code cleanup-4