MOAR FIXES OMG TIRED ALREADY