modified again the bug