Fixed yet another bug