Fix for Snapshot