Bug 787

This resolves bug 787.