Support corner case in MHP analysis