fix snapshot related issue