Finally fixing this goddamn problem?