fix bug with multi-part keys