Fix Sonar Issue: reorder modifier