Don't infinite loop - that's bad (fixes #14)