Yannis: Big regression bug (1/2) fixed - WIP
Yannis: Big regression bug fixed (2/3) -- WIP