Code Analysis fix