fixed some weard error hopefully + format