Bug fix for refactor of version control