Fix Bug 1690

See #1690