self masking eps, still problematic

Signed-off-by: Jun <codedhead@gmail.com>