Wp 975 fix for modularized webinos

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