Fixed Sonar issue
Revert "Fixed Sonar issue"

This reverts commit ef60afdc0cef7d185744a9b85759e06110f81867.
Fixed Sonar issues