fix CR#3