Fixed a Core bug AGAIN!!