Fixed problem when library creation is needed
Updated to 2.6