Added change recommended from issue #622