Fixed pesistence issue