Implement @mwiencek's suggestion