Fixxing issuse