[#83803956] correct logic