Fixing to have it working on DO