fixing AIRAVATA-1219 and AIRAVATA-1220