Fix bug found by Nate Glenn on stackoverflow 19 June: t+