Fixed the bugs of Olympics Controller