Temporary fix issue #3167 in non-multithread mode