Issue #264, fixing reviewers comments