More random crap fix