#19 Changed behaviour according to ticket