yet another stab at Issue #17