#117 Removing bugs.