ticket:82 few changes