really fix the bug