Maid bug fix7