Revert only unfurnished
Fix race condition