A better fix to the bug that caused unnecessary weather fetch