Resolve "Dodgy - Write to static field from instance method" Sonar
issues