Fixed bug with extra QueryWrapper.base