Fix static issue