Convert #540614 to Flügger