Main: Fixing Branch handler