Fix snapshot support.