actually fixing the errors this time