Fix snapshot fetch