Another attempt at #180