fixed the bug for real