bugfix in adapter