Further implementation for bugId 96499