Addressed in ce364a6