EDBService fix