Fix brake after merging