Fixed a little more to avoid symbol collision.