Changed how the bug from the previous commit was fixed