ash's fixes to PR #43