better scope handling for the configured stamp