another stab at #215