iMac will not reconnect to Airport network after sleep after Lion upgrade

I have an iMac and an Airport Extreme. Ever since I upgraded to Lion, whenever my computer goes to sleep it does not reconnect to the wifi network. I have to go in and manually choose my network from the list and that doesn't even work every time; sometimes I have to reboot. I have installed the latest Lion update and that has not solved the problem.