Refix bug fix