Fix for the JIRA GCMVP-230