fixing problems with the adapter