fix bug from user 26/12/2014