Fixed, see new commits.