2way tracking bugs fixed