Minor patch regarding Issue #840