fixing AIRAVATA-1360