Fixing the mistakes