Fix suggested by Chris Mair