Fixing more branch disaster