fixing AIRAVATA-1062