TR-14 base fix, needs test