fix values undefined?