Fex return and add small optimization