BIGGEST BUGGFIX EVER MADAKACKER