Fix another issue related to the previous commit