Fix static calling issue