Fixing my broken fix, let's hope it's fixed.