Addressed in #28