First attempt at #251