Jc/tf issues/149 v2