fixing AIRAVATA-1244