patch to implement suggested behavior change