Fixed #819