Fixed yet another issue