Fixed the errors that might occur on ISO