merge of Tim's change from HEAD