This seems like an issue that will be fixed in newer model releases that are better trained to use skills.