ticket:82 small changes