Version control fix