A somewhat nasty but effective way to resolve #40