Fix for flatrate analyze