Added support for i386