Improved fake mode free plane wave expansion method.