Core: fix