Custom Library fix