fixing AIRAVATA-1280