fixed double action bug