Fixed AIRAVATA-1435.