Lot of fix