Merge Bastien + Yannick

Bug dialog next doesn't display