fix the bug for good