Properly fix the bug this time.