Update scope validation (fix #1)