Fixed return type hints