Minor core fix