First attempt at #242