Fixed bad merge (hopefully that nothing is missing)