fix (a little bit) the core usage