Fix CreateSnapshot