Fixing bug in Get() return value