fix adapter
address @nacx comments