possible fix to AIRAVATA-1418, need to test