Addressed comment in #12