ticket:7 bug fix