Convert #439623 to Flügger