Fixed zone tracking bug