Fixed snapshot issue