Double extension fix for production.