quick fix for bugId: 101530