- Another attempt to optimise performance in non-enabled state