Addressed in most recent commit