Fixed the fix in commit f059ebe117d15292e0d262e6e8e232e835c7e33c.