Small enhancement fix