Trying to fix build problem locking up