Small change to limit changes of original library to minimum