fixing core library bug