Fix BadAdapter after scope refactor