Adding bug reported by Stephen that I need to fix next