Switched to non-fluent dibi in cases where fluent is not neede (improved performance)