Convert #335239 to Flügger