fixed scheduler hang
applied TAJO-985