Convert #379804 to Flügger