Yet another core fix. Oops.