adopt to library changes