Convert #335028 to Flügger