fixed the bug again