Addressed in b4d2e88