r336: fine tuning pemerge