Fixed shuriken-lifetime-bug