fixes #386 loop prevention code missing
12 files changed