Merged fix from John G. Sled