Fix adapter issue