code fix2