Convert #548623 to Flügger