Check tracker before saving. Fix ordering