Try again fixing #1936