Finish Issue #128.