Bugfix for bug #2