Fixed persistence issue