ticket:23 small fix