Fixed core/lib