Production Environment Fix