Convert #337138 to Flügger