Fixing branching issues
Fixing branching bugs