Edit more code change due to silly mistakes.