Fix for my Fix