Convert #329606 to Flügger