Better TC input fix #62