moar stupid fixes