fix for CR#87