Fixed comments

Jira-issue: WP-709