Rebase at commit #99 because of a fatal mistake