improve cd change handling