Fixed (in three files) in 1ae2861