Having Same Issues as Master branch.