fix circular js objs

Jira-issue: WP-1024
Merge pull request #26 from aldafu/WP-1024-fix-circular-js-objs-in-disco

fix circular js objs