Fix issue#902