Fix. Some unfinished code has been added in previous commits.