Last fix to snapshot