Adapter fix