Fixing a bug and, probably, inserting new ones.