Convert #787129 to Flügger