temporary and permanent changes for i386, correcting bug where