The Orioles agreed to an extension with shortstop J.J. Hardy late Saturday night, according to The Baltimore Sun’s Jeff Zrebiec on Twitter. Fox Sports’ Ken Rosenthal tweeted Saturday that the deal is worth $22.25 million over three years, with a limited no-trade clause that would let him block a trade to eight teams of his choice each year.

Hardy is currently batting .278 with a .335 OBP. He has been the most consistently productive shortstop the Orioles have had since Miguel Tejada batted .300 in 2007.

Hardy’s 13 home runs and .490 slugging rank him third among AL shortstops with 250 plate-appearances. He also leads all shortstops in the MLB with a career .994 fielding percentage and just two errors. His 5.01 range factor ranks him second in the AL.