Papered over an ugly link bug