bug fixed define-values