Convert #834525 to Flügger