Convert #679126 to Flügger