Fixed another issue