Fix snapshot support