Fix another issue