Addressed in c1a2a98