Finally fixing this fucking shit.