Base: Fix bug where controller was queried twice