partially fix helmet loss bug