Can you confirm that this doesn't introduce any regressions on #10?