I forgot to refactor this adaptor