fix circular check
fix merge conflict in createAction
Merge pull request #85 from krawaller/fixcircularcheck

fix circular check