Fix for Production DB