add temporary workaround for i686 build issues