fixing for hanging tasks
adding timeout property