[WIP] attempt to fix compilation++