I need this fixed but I don't want to have to refix with every update.
Will have to always check if a later version has changed the core file and merge them