Type hinting fix