Switched to two-pass strategy.