Optimization.
Bug fix.