TAJO-637:Modified bug