Attempt to fix modal scopes