Fixed ISSUE TAJO-37