Fixed #791