Implement fix by @mauermann in #21