Yet another small enhancement