Wp 973 fix for modularized webinos

Jira-issue: [WP-973](http://jira.webinos.org/browse/WP-973)