Convert #623394 to Flügger