actually fixed that bug this time