Convert #228538 to Flügger