Should this behavior be a configurable option?