Completes enhancement #80.