Made it work (again)