Minor behavior change