Fixed build for i686 completely