added fix for snapshots