Addressed PR #309