Addressed by b03f95b