Fixing the errors