tiny fix from NPE's merge