Actually fix the bug mentioned before (missed this part of commit)