[+BUGFIX] Oracle workarounds