New, nicer, fix for bug fixed in commit baa475946e497586fa370ab7558dd2be4a9f8674