Addressed in 535b2d5