[#498] Hotfix for cutoff pins
Merge pull request #549 from akvo/hotfix/498_pins_cutoff

Hotfix/498 pins cutoff