bug fix
Fixed lib issues