Removed a potential bottleneck.