Fixed a bridge bug. Improved generation.