Tentative bugfix