fixup Roukanken
Revert "Revert "Roukanken & Seija bug fix.""

This reverts commit 515588a8c7a25e09d194a76b750d7494828b6283.
Merge branch 'hotfix' into HEAD