fix bugs on sub escs