Fix late static binding error