Count fix for Oracle