from a new branch
fail safe bug resolved.