Addressed in #18