Dead end support - fixes #11