Fixed issues from multikey.