Fixed the listeners not be attached the first time. DOH!