Fix a big bug!!!