Merging Fix V3.5