fixing AIRAVATA-1404 and AIRAVATA-1405