Often I "FIX" people's engines that are having problems, by using a bit of exhaust tubing ( much like Insanemoondoggie ) or at worst I'll put a wire tie around the clip just tight enough to provide a bit more friction to the detents.