fixed typehints