Fixed #883