some changes to find the bug