Wp 972 fix for modularized webinos

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