Fixed Library
merging problem