plug better typehint 5.4
remove typehint to support 5.3