on_start fix reapplied