Fixed #884