Hotfix/498 pins cutoff

@rumca Can you merge and check?