Applied Adrien's fix to GrilleSolo and main