Completed merge of Issue #545 fix from 1.6.4