Fixed a bug with library from bad merge.