Resolves the 2nd half of #194