ticket:6 Bug fix