engine_core fix