FIX: key- & value-size of parameter & list increased