Convert #541336 to Flügger