PR #829 fixed for 1.2.1

See #829