Fixed yet another bug...