fixing AIRAVATA-1279