Addressed validation issue.  Part of issue #41