Fix AIRAVATA-1170.