Adding compatibility with x86. Committing to test changes.