fixing AIRAVATA-1281