fixed issue #901 (2)