actually fixing the bug this time