Fix the bug in a not-so-good way