actually fixing stuff this time