Changes to fix overwriter error.