fix after merged