Sonarfix in structures.py