BUG: Fixed kwarg assignment to list/dict potential bug