Fix for Sonar (reverted from commit d1c7378ac2efb4bceba722985e5fba3ef54b6468)