fixing AIRAVATA-1205