fix scope and add default scope