Adapter bug fixed