Fix the mistakes