Fix bug if advanced cp isn't install
Merge commit '32197a4'