+ issue #79: fixed scope calculation.