Added --fork to upgrade as well (#217)