Fix for v1.0 prod