Fixed #773