Fix a bug reported by Lara Wilcocks