Trying to fix bugs.