fixing AIRAVATA-1264