[#31216] Improved some syntax (Fix #1333)