Convert #623551 to Flügger