Fix forward port improved

This should have a non ambiguous diff...