Smarter nick completion