revert old weather fix and added a better solution