Fish Wang says to YSITD
Another commit #1: fix bug. Another commit #2: fix bug again. Another commit #3: I think this should finally fix the bug.