Fix for public adapter.