Fixed addon, resolvers