fixing AIRAVATA-1242