Hopefully fixed oracle