Fixed issue when only a single TF or SF is present.