Attempt to fix last modified function