Stop doing that weird "new function" business