some fix for typescript