Fix for type hinting!