Made some minor changes. (Bugfix)