another core fix