Convert #315489 to Flügger