Fix for Error Code