Fixed the bugs?...