Attempt to fix DO bug