Merge pull request #1194 from robertovargas-arm/io-fix