ticket:73 few changes