ticket:58 fix