Changed production to provide fallback