Fixed #863