Fixes: #2169 Using sub instead of base scope for snapshots