Convert #379374 to Flügger