logic fix2