TAP file reading improvement