Weird issues with Kyle's commit