ticket:13 fix