core: fix to 4f61ddd