Oh how freaking ugly this fix actually is