Tried to fix lib II