Fixed logic in status_tracker