modify by yuri for 0815