fixxing bug