Static Analysis bugfix