Another stab at #113