ticket: 3 fixed