Completes enhancement #68.