Fix cd issue