bugfix introduced by merge