improved fix to sourcing in cmi_env.sh