fix for CR#2