ACTUALLY fixed that bug