St00pid merge crap fix