Tentative trunk fix