fix potential key/value issue