Implementation of bugID 100228