Addressed by 534523c