Fixed the adapter issue