Fixed bug #887