fixing AIRAVATA-1479