ticket:38 fix