ticket:10 little fix