[#66519656] fix logic