more fixxing