fix at (improve shortcircuit)