ticket:23 Small fix