Bug 822

Fixed: 822