Slightly improved nick handling