Fixed the raw functions