Fix static code