Removed static location for debugging