Convert #187634 to Flügger