Save ourselves headaches and just replace the local function