fix singleton and value attribute issues
push v31