Jc/tf issues/253