Chatter Bug fix