fix ups for pull #58