trying to fix bug in adapter