Fix problem with default scope