Addressed in #12