Completes enhancement #66.