fixed replacement for adapter library