FIX: Don't quit early