Implementation of bugID 96499