those 2 lines looks very bad. @jpdeplaix , any suggestion to make this clean ?