Convert #227623 to Flügger