First attempt at #259