FIX BUG0001:Confusion of the return on keys and values