SONARDOTNT-271 Fix the little regression