Temp fix for snapshot parsing