Removed static to avoid warning in dev mode