Fixed bug with branch paths & crash starting first time