Issue #890 fixed