Convert #328534 to Flügger