Yes this is for unit-testable fix.