Skewer: fixed 1 to many mapping for polk.