fixing AIRAVATA-1257, AIRAVATA-1258