Add a fix from Geoff Kuenning