another stab at #114