core library fix