Fixed weirdest working bug so far