First fix attempt of Q3 according to comments of Vadim