Improved version of PR #86.