Version Control Fix