Snapshot router fix