changes for ticket number 1179