conditional to avoid todochiku
fix merge