Trying to fix the bugs.