Convert #623186 to Flügger