Fixing chaotic commit

Sorry for the inconvenience. The commit before apparently generate
messy environment. Sorry, I do the merge without checking it first.