Fix added for recent changes in non-threading environments.
2 files changed