Fixed format for the first tow methods

Jira issue: WP-932