More crap fix