New fix tentative. WIP