fixed A LOT