JIRA 334 fix
commit after pull request