Fix a major bug