Added patch from fxp