Issue #423 fixed code reviewer's comments