Fixed Severity `Major` from Static Code Analysis