Riffle Effect: [Patch Note] bug fixes on May 11

[Fixing the bug] Fix other bugs