Fixing set() return value