fixing AIRAVATA-1494