ticket: 6 fixed