Merge broke something, so now it is fixed again