Fix cdi issue