Fix hopefully for i386