bug fix for the JIRA issue WK-19