ticket:1 corrections according to remarks in the ticket