Added support for i686