ticket-14 fix