Convert #387589 to Flügger