Fix return typehint
Fix for access issues with late static binding