Fix the bug I created while fixing the last bug