Correction of Code Analysis issue