Patched for production