changes for ticket number 1218