First attempt at #198