Fixing for oracle