Bug fix for merging new version