Fixes kits as well