Maid bug fix2