Fixed AIRAVATA-1495.