bugfix for bug 1