Improve weather check