Fix for static code analysis