Improve getValue()