Fixed Bert's screwup merge