fix effect
Merge branch 'yuuki2'