Fixed a bug.
Third commit.
Fixed another bug.
Merge branch 'BugFix'