Fix a fatal bug