Address @jlee-r7's comment on #58 by matching 8.1