re-enabled a previous bugfix which was lost in a merge