Fixed #784