Addressed by 07e60f6