Production Fix: Spec Fix