[#498] Hotfix for cutoff pins

@rumca Can you merge and check?