Load core before client (not reliable)
Fix scope