my changes that fixes the bug