Fixed #775