Proper fix for "Static Analysis issues fixed"