Fixed core dependency