Bugfix for bug 1084070