Fix bug introduced in 1.5.2