Fix issue with type hinting