fixing trade to be compatible with front end