Convert #335047 to Flügger