Fixed CTM issues introduced by 4direction