readd Clem's change from 1d63060e73b088391bfeccf0990ff6d5bd924fc2