Convert #148605 to Flügger