Fixed changes overwritten by previous 2 commits.