Debug again to fix Sonar issues