Attempt branch fix #2