adapt library to our issue