Fix for rating issues