Tiny Bugfix #2