porting change for fmedit project