Convert #348449 to Flügger